Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(Angular): deprecate angular.merge #16036

Merged
merged 2 commits into from
Jun 12, 2017
Merged

Conversation

Narretz
Copy link
Contributor

@Narretz Narretz commented Jun 6, 2017

This function has problems with special object types but since it's not used in core,
it is not worth implementing fixes for these cases.
A general purpose library like lodash (provides merge) should be used instead.

Closes #12653
Closes #14941
Closes #15180
Closes #15992

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Deprecation

What is the current behavior? (You can also link to an open issue here)
Unclear API support

What is the new behavior (if this is a feature change)?
Deprecation / docs update

Does this PR introduce a breaking change?

No

Please check if the PR fulfills these requirements

Other information:
Not sure if this should be marked fix or feat
If we deprecate only in 1.7.0, then the known issue section can still go in 1.6.x

This function has problems with special object types but since it's not used in core,
it is not worth implementing fixes for these cases.
A general purpose library like lodash (provides `merge`) should be used instead.

Closes angular#12653
Closes angular#14941
Closes angular#15180
Closes angular#15992
@Narretz Narretz modified the milestones: 1.6.5, 1.7.0 Jun 6, 2017
src/Angular.js Outdated
* @deprecated
* sinceVersion="1.6.5"
* This function is deprecated, but will not be removed in the 1.x lifecycle.
* There are a edge cases (see {@link angular.merge#known-issues known issues}) that are not
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a edge cases known issues --> ???

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get rid of the a I guess. Did you read over the (see known issues)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right. I missed (see 😃 So, just remove a then.

src/Angular.js Outdated
* using [lodash's merge()](https://lodash.com/docs/4.17.4#merge) instead.
*
* @knownIssue
* This is a list of (known) object types that cannot be / are incorrectly handled by this function:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cannot be / are incorrectly doesn't read that well. I would split it up (e.g. cannot be handled or are handled incorrectly) or change it to cannot be correctly handled or something.

@Narretz Narretz merged commit 464dde8 into angular:master Jun 12, 2017
@Narretz Narretz deleted the angular-merge branch June 12, 2017 14:11
Narretz added a commit that referenced this pull request Jun 29, 2017
This function has problems with special object types but since it's not used in core,
it is not worth implementing fixes for these cases.
A general purpose library like lodash (provides `merge`) should be used instead.

Closes #12653
Closes #14941
Closes #15180
Closes #15992
Closes #16036
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
4 participants